cleanup from merge conflict