Comments and removal of conflict in SQL file