resolving merge conflict with master