small edits
got rid of merge errors