fix comflict