Corrected bad merge