merge some stuff for new pull request test