Bug fix
Merge conflict solve