Osama test merge