removed conflicts