Fixed merge conflict closes #1907