protip: if the language allows it, put a comma at the end of a multi-line data structure. merge/rebase will work correctly more often.