merge memo
fixed conflicts