Corrected repo conflicts