TURNT
fixed merge issues