Added door.
Resolved conflicts