some changes in master
resolve merge conflict
r2 finish up