fix(app): fix bad merge