merge
duplication prevention code added and tested, YAML used