cleaned up merge conflicts
cleaned up rake file