General adjustments
Resolve merge