removed wall and werror for now
fixed conflicts
merged conflicts
resolved conflicts