Merge with CPC and removing conflicts