fixed some bugs
merging bra