Multi user editing - conflict handling

Two users were able to edit an objects attributes in a form at the same time in an editing session and as user #1 ended their session and committed the changes user #2 had to resolve any conflicts before saving just like it happens in code merging tools.