merge os dev