Creates cards list and resolves conflicts