Removing some lines automatically merged by git which broke edmx...whoops