Change theme to Budget Bumbago.
Merge the code and solve the conflict.