code formatting
merge fix