more indentation work
merge resolve attempt