converted list to map
fixed conflict, hopefully