fixed merge conlicts