repair bugs before merge