Fix mistakes in merge