Resolving batch classes conflict