Add all action classes and mappings
Add signon page after merge conflicts