new inline is added
Merge branches 'master' and 'my_branch'