main function added
Conflict solved