Some changes, such as whitespace
Manual conflict resolution
Notes location