History modified in preparation for merging with master branch and a point of reference