user stuff
merging conflicts
fixed conflicts and updating