fixed merge
added back memory
merged again