Fix bug in borrowing
Fixed conflicts