fixing python indent error
merge