merge new commits into test