fix bad merge of peep content