Removed GIT merge headers from data (breaking map)

also added some ; and reset default to chloro