fixes issues with merge on css files after compiling