working on falling platform
Cleaning merge conflict
: