removed lines added from merging