changes?
fixing conflict
fixing scss error