changed type of user in feeditem
merge