uprava ve webfile
conflict resolve