mj has landed
merge resolved