Resolve merge conflicts with master