Corrected merged conflicts