rolled back conflicted changes