Keep the changes
Buggy DetailsView
Merge branch 'notReady'
Merge