Make sure we do resolve merge conflicts