removed the pivot app - merge error