Fixed bugs related on branches merging.