Added EditOperation class to check conflicts