Added to bar
Merge conflict
Change again
Small feature change