Better assersions
merging upstream changes
Resolving conflicts