Fix README to not have the merged conflict