fixing merger errore