deleted extra lines from merging