resolve merge and add completed?
Merge branch 'master' into carl