Clarifying comments
merging conflicts
Adding new stuff