Corrected unmerged conflict