Nicified
Formatted
Fixed conflicts