fixed rake task issue
CONFLICT RESOLVED