resolved merge conflicts in transitions.scss resulting from single space addition