modify readme

README.md

@@ -234,11 +234,7 @@ you can do so with a simple environment variable, instead of editing the
             --ignore-model-subdirects    Ignore subdirectories of the models directory
             --sort                       Sort columns alphabetically, rather than in creation order
             --classified-sort            Sort columns alphabetically, but first goes id, then the rest columns, then the timestamp columns and then the association columns
-<<<<<<< HEAD
-            --classified-sort-updated    Sort columns alphabetically, but first goes id, then the association columns, then the rest columns and then the timestamp
-=======
             --classified_sort_fks_second Sort columns alphabetically, but first goes id, then foreign keysm then the rest columns, then the timestamp columns and then the association columns
->>>>>>> 5fa6a99 (Support for Productboard sorting)
         -R, --require path               Additional file to require before loading models, may be used multiple times
         -e [tests,fixtures,factories,serializers],
             --exclude                    Do not annotate fixtures, test files, factories, and/or serializers