fixed conlict in merge