add to master
merge it
remove empty lines
merging