FIXED IT!!!  Made the project merge successful!

The app now has maps integrated with it.  The maps do not fully work but
they no longer cause a crash.