Somehow slipped up and merged a different branches files into HEAD