new update 4 merge problems