Removed failed merge resolution.