found problem merge fixed