erm...you wanna remove that `<<<<<<HEAD` bit?! :)