closes #329
fixed conflict