bazard
manual merge