Fix merge + some clean