Improved editing and conflicts resultions