updated machado
merge conflict
resolved merge conflicts