Choosing merge strategy
Merge remote-tracking branch 'sapone/refactoring' into refactoring