PixelFormat.cpp: remove conflict marks