resolve conflict in Logic Class