merge conlicts fixed