got checkout working and fixed that stupid semi-colon bug
conflict resolved