Fixing conflicts

Style, should by `} else {`