This is strange! On my copy the <<<<HEAD is above //persist Level object, and I comment out the merge conflict just in case we want to keep that stuff.. I will try pushing again to git soon