removed merge conflic characters