use util:overlap in main.lua
I don't know what I did, but I fixed the merged conflict somehow