Fix conflict errors not resolved