Fix code confilt