sigh merge
commit for jonathan to work on collision