Bug fix
Bug fix, merge conflict