Code Reformat
Fix merge