correct branch logic
correcting conflicts
v1.2 - locals interface