big fixation
solve the conflict