Add trash
Fix conflicts