fixed a fed indentation issues
fixing merge conflicts