fixing conflict between two classes