fixed collision bug
conflict?