For conflict

Dominykas.Duleviciusrequested to merge
forConflict into master

Created by: Dominic-dul

test for resolving conflict

Merge request reports