fixed a conflict at main