Merge conflicts are the worst. Congrats on avoiding them!