styling
fixed merge error