Fix merge error
Formatting