merge pull request and fix some conflicts