Resolved conflict
New test for plist regresh