Tyono/conflict with Kuboia

plz edit this