Messenger can now have action handlers unregistered
Fix up project file merge problem