resolve merge confligt
resolve merge conflict
integrate tabs list view
merge vic's changes