fixed fragments
fixed merged