Adding deployment create view
Fixing conflicts