Finalizing deliverable
Merge resolution stuff