may have some erros but i dont want to have merge conflicts tomorrow