Fixed branching conflict.