Conflict edit on the server

Try conflict edit on the server.