Merge conflicts fixed

Functional