I Think i solved the merge conlict