converts README to markdown format
removes git merge marker