merge triangle from local branch