Fixed issue with merges failing due to needing to edit merge message
Bumped version