Made good changes
Merged conflicts