Panel pricing done, both global and local
merge resolved