updated from merge conflict