final merge commit