Fixing merge bug

I'd better take some remedial git!