commiting in branch...
resolve merge conflict
ready for second release