Correct Formatting
Fix merge issue