small change
Merge conflict resolution
Small changes to view