merge not finished