mrge conflicts resolved