updated pedro bio
fix conflicts