Dmitry config changes
Conflict solved