i modified pluto yay
solved the conflict