Actually fixed that conflict bug