Merge conflict
Added test for invalid keys