khloud fixed conflicts in s6/s7