small merge conflict fix
small merge conflict fix

LockerProject/Locker,quartzjer/Locker,othiym23/locker,LockerProject/Locker,quartzjer/Locker,othiym23/locker,othiym23/locker,Singly/hallway,LockerProject/Locker,quartzjer/Locker,LockerProject/Locker,quartzjer/Locker,othiym23/locker,Singly/hallway,LockerProject/Locker,othiym23/locker,quartzjer/Locker