messed stuff up
fixed conflicts