Merging fixed/float codebase