preparing for SDL
Conflicts