Checkin again after merge error