Fixed indentation issues
fixes merge conflicts