replacing :exclamation: with :pencil2:
replacing :exclamation: with :pencil2:
fixed conflict