fix overlapping content in commits