clean up merge conflict a little bit