Fixing obstacle moving logic
Resolving conflicts