fixed comflict