Merge script with a final commit to make history a bit clearer.
Removed warning not to use merge commit.