But the *-images.scss files should be able to be merged with their parent right?