Merged from dinopollano-master
dealing with merge conflict
dealing with merge conflict