moved log page
merge conflict