fix(app): fix merge conflict