merge fgixing
found problem merge fixed
merge conflicts
merge fixes