Main.scss conflict committing the correct one