Second attempt on proper merge