resolving merge conflicts to merge with master branch