resolved conflick between master and origin/master
mod in first.txt on master