New links and merging fix