Fucked up repo - remove merge rubbish