automatic conflict resolver for structure.sql