create physical events
merge image in bob
create and delete physical listeners
merge
merge again
fix merge conflict
Merge branch 'master' of github.com:Timalkemade/playful-octo-bear