Updating obstacles logic
Resolving Conflicts