Sorted out non conflict ...

conflict was just indents