re-style bump it up
finish resolving conflict
relocate theme stylesheet