fix
from mac
merge conf