removed ordering migration
forcing heroku push with a comment
removed comment whatever
fixed conflicts