add branch.relativePath to locals
remove flatten test for conflicting local names

since the builder handles it now