commit for merge conflict
resolve merge conflict
smits new page
edited smits page