Fix merge conflict in sass