Fixet using statements
Conflict sorted