Toni Klopfenstein Fixing README merge conflict