resolve merge conflict with master