fix: removed merging relicts