fixes merge conflicts in pieces scss