Remove merge conflict + added theme example