pull
merge conflict in app helper