Sort branch lines to prevent conflicts
Remove useless comment...
Merge pull request #3880 from Kingcom/BranchLines

Small branch line fix