copy file from conflict, we don't need this one