Add falling detection
Merge conflict