modal functionality
Resolve merge conflicts