fixed big comflict