closes #294
fixed conflicts