formatted code
merge