Rollback of conflicted change