fixed the mess from merge commit