works fine
Merge branches 'your-branch' and 'master'
works fine