Merge and restructuring of source files after concurrent editing