fixing code layout
Fixing broken merge