update chosen with new commits from master