Fix merge of main