Merge all changes so the examples can be displayed