add converts dir and current staged changes
merge conflicts