commit to pull
Fixes merge conflict.