fixed merege conflict