pixed conflicts