new_one added
new two added
Merge branch 'master' of https://github.com/karasuhaneto/conflict into new