fixed merge errors...akiva...