todo list app example
conflicts resolved