[MIG-88] Resolved conflicts