fizing merge