removed lines added in the merging