merged conflict; send new pull request