Fix merge
Merge conflict fixed