fix conflift