Clean into Application. Add DebugState
merge