fixe merge issues