fixed keys in order for sanity check
fixed merge conflict