Update vile view
Fix conflict