code formatting
probably a bad file
Fixed conflicts