Swap function headers for fun and add 1 silly function prototype
Resolve the conflict. Found out that it is a minor problem.