merging in flexible pull request