fix indention, revert merge failures