list off locations
fixed merge conflict