fixed opencl bugs
fixed conflicts