resolve conflict authored by Antonio Politi's avatar Antonio Politi
File changed. Contains only whitespace changes.