Adding justAnotherFunction to the main function
Merging files conflict solved