bio pull from wikik
fixed merge conflict in profile controler