Fix crazy figure 4 float
Fix merge