New commit from remote causing conflict