Cleanup bad merge