cleaning up merge conflict stuff some more
fixing stuff from change to sellar