Recommit conflict overwrite from Quang