Returning conflict files