Fixed improperly merged project file & bad character in app delegate