Resolved conflictes in Bin and Lib after previous merge