manage to do huge mistake when I merged before, should be fixed now.