Bugfix master
Resolve merge conflict