fixes bad merge and adding the changes back