Fix Fail Merge code