learned how to fix confilict :D