Resolved Branch mess