updated manifest
fixed conflicts