fixes #25
fixed conflicts