removed lines added by the merging