Visibility testing
Resolved conflicts