Cleaning up bad merge