old and new branch need to be 2 things