MemoryBase.cpp: remove conflict marks