v1.4.3: fixing incorrect merges