correcting conflict errors