Fixing format issues to master
Attempt to fix conflicts