sort changes of topic before pulling

 this prevents later changes to be pulled before former ones,
 and avoids merge conflicts

Signed-off-by: Arnav Gupta <championswimmer@aokp.co>
Merge remote-tracking branch 'aokp/kitkat' into kitkat