Update branch and resolve conflict