fixed .rake_tasks merge conflict