Formatting
Cleaned up conflicts