Fix conflict remain