Resolving merge conflict