Small update
Merging issues