Corrected overwrite with merge conflict