add view methods
resolve conflict