The readme mentions
When a merge conflict occurs where the last property of an object is removed, accepting the removed version will result in invalid syntax due to a trailing comma on the preceding property. Care should be taken to verify the syntax of the overall file and manually update accordingly.
Would it be possible that the merge driver automatically invokes composer validate after a merge to make sure (and the user aware) if the generated files contain a syntax error after merge (so we dont need to manually be aware of this edge case)?