changed asdf stuff
fixed conflicts