correcting fr
merging fr