Commit to avoid a merge conflict.