changed formatting of file
Fixing merge