added more specific use of branch: see if conflict