merge manual no branch do practical solutions...