removed conflicts for johannes