Fix merge issue in sass