rename branch and resolve conflict