Fix styling
Resolve merge confilict