resolving merge