Merge Conflict resolved.