after mearge fix