Updated merge conflicts within the SQL install files.