Only this part has a conflict while rebasing master branch. merged by hand.