conflicts commit fixed media