fixing errors from merge conflict