Dont commit merge now generic option. Closes #1882