fixing more conflicts
merge