Merge conflict
Finally fixed