Change theme
Fix merge conflict