Added formating to the code
Fixed merge conflict
Formating