made some changes to force conflict gain
merge the conflicts