Theres only one way to solve merge conflicts! reset --hard!