Fixed some old conflicts