solved conflicts, fixed views and uploader, added seeds