Resolve merge conflicts
Resolve merge conflicts with master