Merge conflicts resolution
Fix merge conflicts