da bomb fo shizzle
fixed conflicts