Fixed git conflict buggery