TASK29: Attempt to resolve some weird conflict

Smth wrong with task19 and merging that all