Adding basic view for confirmation
Fixing conflicts