fxied commit conflict