merging pull request by chanind