fix feature branching