resolving merge conflict for readme after repo rewrite