updated Add Lockers

does not include settings merge