Creating commit for merging and adding new data from pull request to solve merge conflicts