Merging problems
Merge branch 'master' of https://github.com/lishar/checkpoint
Resolve merge conflict