fix remote/branch issue