how should port file confilicts/updates be solved?