indented properly
merge resolved