Resolve merge
Complete merge