deleted old content

solving merge error