Cleaning up another bad merge