Concurrent edit not supported

@biondo Is trying to solve, this is the repo to work on. A basic smart-merging feature was develeoped, need to be tested