Issue #131 - modify Manifest
undo changes in main activity
Issue #131 - fixing conflict