remove devel-jf-git-pull
Merge conflict.