updated features, removed conflicts