Fixed up merge conflicts in readme