fix views
fix merge conflict