my first changes were correct
conflict resolved