git merge error  pg tree ...