repair 404 call
Merged 'dev'.
Finish refactor-conversation