fix indentation
fix merge conflict