tidy files untidied in merges