msg
resolve merge conflict
added notes completed
added contacts list