resloved conflict errors