Seems to work with testing, and even apims parsing. Added simple conflict resolution.