Move flatfish to master branch