Edit Functionality
Resolve merge conflicts