fix dependencies problems. still more to come
solve merge conflict