Conflict Resolution Manual Merge added