merging
merge conflict solved
corrected small error in main