manual merging in latest head