Final merge push