Resolved the confliction
Merge