* Fix merge conflicts
* Formatting