addint a main function
fixing conflicts