resolve merge conflcits with master