[sprint 6] fix merge broken marriage but MESS!!