Re-commit in order to merge