fix merge conflict + URL
fix merge conflict + URL

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