added collection,links and more
conflicts