fixed merge: compiles again, branching ignored for now