fix the merge conflict, properly this time
redo indentation