Personal settings br

there is a problem automatically merging from eclipse