fix some issues from the conflicting merge