cleaning up merge stuff
merge conflicts