make collision an emitter
remove .idea folder
fix conflict