merge!
allow merges of unrelated parents (no common ancestor)
indentation fixes
rename detection (exact)
rename_conficts tests