Trying to merge again ...