- add view spec and controllers spec
- resolve conflict