Adds interactive merge feature, fixes tests, and refactors code for merging with existing locale file.