added ConflictResolver and impl;
new views system.