manually resolving merge conflicts