Addition works
Fix merge issue