KK >> client's issues fixed
KK >> fixed conflicts