correct padding issue created during merge resolution