finalised merge finally?