corrected bad merge