Updated door asset
Resolving Conflicts