rake task works locally
merge conflicts