Resolved merge conflict and corrected indentation