disabling fast mode fixes some errors with merging