DATAES-91 - removed merge conflict file