GEORGE XENAKIS 795197 EG-252-EXERCISE

Sorted all conflict.