fix for admin files
conflict resolving