Change root to tips#new
Merge with master