sort changes before pulling

to avoid merge conflicts of pulling later
changes before former