revert to previous commit
test if HEAD is pointed right
resolve merge conflict in viewers#show