Fix conflict markers
Alphabetise