Final merge commit