Error resolved from Event and Listener files (cross reference errors)
Merge conflicted project files