Organize gitignore.

- sort alphabetically
- remove the <<<<<<< HEAD merge artifact