merge wierdness
start position fix
fixed merge