added main()
delete conflicts