Fix underlines
Resolve merge