eek changes merge