Fix merges of themes