Fixed out4 conflicts