Fix bad merge

left merge code in