manually fixed conflict
changed to master
page2 addition