Test conflict checkin
After local merge