merge master and userB