Took out some commented out lines
Dealt with merge conflicts