merge with master and fix 4 conflicts by hand