Small bug fix
Merge conflict resolved