Another try to merge