Committing local merge of stash with geoq view cache additions