Commented out unnecessary lines
Fixed conflicts