fix merge conflict, recompile scss