committed after the remote edit
fixed conflict