Merging options now checks if an option is locked before merging it