Fix conflict on fixbug