Adding PQDoorController
Resolving Conflicts