Resolve formatting
Merge
Merge again