minor changes from merge conflict