Cleaning things up a bit
Solving conflicts (de canard)