resolving merge conflicts