Fixes #727
Fixed conflicts