Resolving merge conflicts