merge + fixes