[merge] problem with merge again