Fix merge conflict - again
Fix merge conflict - and again