Fix some conflict errors