Remove obsolete DataContext from bad merge