views for design versions
merged conflicts