simulando merge 2
fix merges