Fix terrible merge and update README