Fixing dodgy merges