views
usuniety gemfilelock
Fix
conflicts