Basic Level Stuff
Removing redundant includes.
Merged conflicts
Re-fixed double shooting