fix prompts bad merge
Merge branch 'master' of github.com:DLarsen/rekon