Refactored commit resolution in ATOM transformation as template application