Can do wg!!
Merge conflict resolved
Works fine now