add bar()
manual merging confilict