resolved  merge conflicts