Also update plist generation and bump conflict markers. requested by edd@ (the one who actually wrote the diff)