Merging with master and resolving conflicts